Fix compile error from splitting bitmask code

GtkBitMask was typedef'd twice.

diff --git a/gtk/gtkbitmaskprivate.h b/gtk/gtkbitmaskprivate.h
index 5e61c3c70c9f7f52ddc50e9c9de3c712524cdb65..4a255efa26ec16b741a13bec644289049b560f17 100644 (file)
--- a/gtk/gtkbitmaskprivate.h
+++ b/gtk/gtkbitmaskprivate.h
@@ -21,12 +21,10 @@
 #define __GTK_BITMASK_PRIVATE_H__
 
 #include <glib.h>
+#include "gtkallocatedbitmaskprivate.h"
 
 G_BEGIN_DECLS
 
-typedef struct _GtkBitmask           GtkBitmask;
-
-
 static inline GtkBitmask *      _gtk_bitmask_new                  (void);
 static inline GtkBitmask *      _gtk_bitmask_copy                 (const GtkBitmask  *mask);
 static inline void              _gtk_bitmask_free                 (GtkBitmask        *mask);

diff --git a/gtk/gtkbitmaskprivateimpl.h b/gtk/gtkbitmaskprivateimpl.h
index e678a81d4448a37256b03227988b10b1b12b5f01..0dea65abe79843a4e05debcd7cc8940df23955f5 100644 (file)
--- a/gtk/gtkbitmaskprivateimpl.h
+++ b/gtk/gtkbitmaskprivateimpl.h
@@ -18,7 +18,6 @@
  * Authors: Benjamin Otte <otte@gnome.org>
  */
 
-#include "gtkallocatedbitmaskprivate.h"
 
 static inline GtkBitmask *
 _gtk_bitmask_new (void)